mt76: do not wake tx queues during flush
This commit is contained in:
parent
782349df8e
commit
7a494295cb
@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
|
|||||||
|
|
||||||
PKG_SOURCE_URL:=https://github.com/openwrt/mt76
|
PKG_SOURCE_URL:=https://github.com/openwrt/mt76
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_DATE:=2018-10-27
|
PKG_SOURCE_DATE:=2018-11-09
|
||||||
PKG_SOURCE_VERSION:=fdc63f168eeb64e1849852cbd242ef7b93d9e0ac
|
PKG_SOURCE_VERSION:=ffccb48c5082b2c6f43a0235b77b62ca388810f0
|
||||||
PKG_MIRROR_HASH:=93dfa4d980fc55d4a1f2e495657d2495af5222a70f57f5f4a49c64c845fa3faa
|
PKG_MIRROR_HASH:=bff0063db1a1b1353f59aad16abad4dd93ceeb4c672811ad864cebe0e39c7d8d
|
||||||
|
|
||||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||||
PKG_BUILD_PARALLEL:=1
|
PKG_BUILD_PARALLEL:=1
|
||||||
|
@ -153,5 +153,6 @@
|
|||||||
mt76@0,0 {
|
mt76@0,0 {
|
||||||
reg = <0x0000 0 0 0 0>;
|
reg = <0x0000 0 0 0 0>;
|
||||||
mediatek,mtd-eeprom = <&radio 32768>;
|
mediatek,mtd-eeprom = <&radio 32768>;
|
||||||
|
ieee80211-freq-limit = <5000000 6000000>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -115,10 +115,10 @@ define Device/netgear_r6120
|
|||||||
IMAGE_SIZE := $(ralink_default_fw_size_16M)
|
IMAGE_SIZE := $(ralink_default_fw_size_16M)
|
||||||
DEVICE_TITLE := Netgear AC1200 R6120
|
DEVICE_TITLE := Netgear AC1200 R6120
|
||||||
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
|
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci
|
||||||
SERCOMM_KERNEL_OFFSET := 90000
|
SERCOMM_KERNEL_OFFSET := 0x90000
|
||||||
SERCOMM_HWID := CGQ
|
SERCOMM_HWID := CGQ
|
||||||
SERCOMM_HWVER := A001
|
SERCOMM_HWVER := A001
|
||||||
SERCOMM_SWVER := 0040
|
SERCOMM_SWVER := 0x0040
|
||||||
IMAGES += factory.img
|
IMAGES += factory.img
|
||||||
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE)| append-rootfs | pad-rootfs
|
IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE)| append-rootfs | pad-rootfs
|
||||||
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
|
IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size $$$$(IMAGE_SIZE)
|
||||||
|
@ -14,7 +14,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -628,6 +628,8 @@ config RALINK
|
@@ -629,6 +629,8 @@ config RALINK
|
||||||
select CLKDEV_LOOKUP
|
select CLKDEV_LOOKUP
|
||||||
select ARCH_HAS_RESET_CONTROLLER
|
select ARCH_HAS_RESET_CONTROLLER
|
||||||
select RESET_CONTROLLER
|
select RESET_CONTROLLER
|
||||||
|
@ -14,7 +14,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -630,6 +630,9 @@ config RALINK
|
@@ -631,6 +631,9 @@ config RALINK
|
||||||
select RESET_CONTROLLER
|
select RESET_CONTROLLER
|
||||||
select PINCTRL
|
select PINCTRL
|
||||||
select PINCTRL_RT2880
|
select PINCTRL_RT2880
|
||||||
|
@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
|
|
||||||
--- a/drivers/media/usb/uvc/uvc_driver.c
|
--- a/drivers/media/usb/uvc/uvc_driver.c
|
||||||
+++ b/drivers/media/usb/uvc/uvc_driver.c
|
+++ b/drivers/media/usb/uvc/uvc_driver.c
|
||||||
@@ -2734,6 +2734,18 @@ static const struct usb_device_id uvc_id
|
@@ -2727,6 +2727,18 @@ static const struct usb_device_id uvc_id
|
||||||
.bInterfaceSubClass = 1,
|
.bInterfaceSubClass = 1,
|
||||||
.bInterfaceProtocol = 0,
|
.bInterfaceProtocol = 0,
|
||||||
.driver_info = UVC_QUIRK_FORCE_Y8 },
|
.driver_info = UVC_QUIRK_FORCE_Y8 },
|
||||||
|
@ -0,0 +1,67 @@
|
|||||||
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||||
|
Subject: [PATCH] Revert "mtd: nand: Remove unused chip->write_page() hook"
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
This reverts commit f107d7a43923a83d837b3ea3c7b7de58cd014bbd.
|
||||||
|
|
||||||
|
OpenWrt's downstream driver mtk_nand2 still uses that callback.
|
||||||
|
|
||||||
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||||
|
---
|
||||||
|
|
||||||
|
--- a/drivers/mtd/nand/nand_base.c
|
||||||
|
+++ b/drivers/mtd/nand/nand_base.c
|
||||||
|
@@ -2577,7 +2577,7 @@ static int nand_write_page_syndrome(stru
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
- * nand_write_page - write one page
|
||||||
|
+ * nand_write_page - [REPLACEABLE] write one page
|
||||||
|
* @mtd: MTD device structure
|
||||||
|
* @chip: NAND chip descriptor
|
||||||
|
* @offset: address offset within the page
|
||||||
|
@@ -2761,9 +2761,9 @@ static int nand_do_write_ops(struct mtd_
|
||||||
|
memset(chip->oob_poi, 0xff, mtd->oobsize);
|
||||||
|
}
|
||||||
|
|
||||||
|
- ret = nand_write_page(mtd, chip, column, bytes, wbuf,
|
||||||
|
- oob_required, page,
|
||||||
|
- (ops->mode == MTD_OPS_RAW));
|
||||||
|
+ ret = chip->write_page(mtd, chip, column, bytes, wbuf,
|
||||||
|
+ oob_required, page,
|
||||||
|
+ (ops->mode == MTD_OPS_RAW));
|
||||||
|
if (ret)
|
||||||
|
break;
|
||||||
|
|
||||||
|
@@ -4719,6 +4719,9 @@ int nand_scan_tail(struct mtd_info *mtd)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (!chip->write_page)
|
||||||
|
+ chip->write_page = nand_write_page;
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Check ECC mode, default to software if 3byte/512byte hardware ECC is
|
||||||
|
* selected and we have 256 byte pagesize fallback to software ECC
|
||||||
|
--- a/include/linux/mtd/rawnand.h
|
||||||
|
+++ b/include/linux/mtd/rawnand.h
|
||||||
|
@@ -862,6 +862,7 @@ struct nand_manufacturer_ops {
|
||||||
|
* structure which is shared among multiple independent
|
||||||
|
* devices.
|
||||||
|
* @priv: [OPTIONAL] pointer to private chip data
|
||||||
|
+ * @write_page: [REPLACEABLE] High-level page write function
|
||||||
|
* @manufacturer: [INTERN] Contains manufacturer information
|
||||||
|
*/
|
||||||
|
|
||||||
|
@@ -885,6 +886,9 @@ struct nand_chip {
|
||||||
|
int(*waitfunc)(struct mtd_info *mtd, struct nand_chip *this);
|
||||||
|
int (*erase)(struct mtd_info *mtd, int page);
|
||||||
|
int (*scan_bbt)(struct mtd_info *mtd);
|
||||||
|
+ int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
|
||||||
|
+ uint32_t offset, int data_len, const uint8_t *buf,
|
||||||
|
+ int oob_required, int page, int raw);
|
||||||
|
int (*onfi_set_features)(struct mtd_info *mtd, struct nand_chip *chip,
|
||||||
|
int feature_addr, uint8_t *subfeature_para);
|
||||||
|
int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip,
|
@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
|
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
|
||||||
return ret;
|
return ret;
|
||||||
@@ -1170,7 +1222,7 @@ static const struct flash_info spi_nor_i
|
@@ -1176,7 +1228,7 @@ static const struct flash_info spi_nor_i
|
||||||
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
|
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
|
||||||
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
|
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
|
||||||
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
|
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
|
||||||
@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
{ "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024,
|
{ "w25m512jv", INFO(0xef7119, 0, 64 * 1024, 1024,
|
||||||
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) },
|
SECT_4K | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ) },
|
||||||
|
|
||||||
@@ -1230,6 +1282,9 @@ static int spi_nor_read(struct mtd_info
|
@@ -1236,6 +1288,9 @@ static int spi_nor_read(struct mtd_info
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
while (len) {
|
while (len) {
|
||||||
loff_t addr = from;
|
loff_t addr = from;
|
||||||
|
|
||||||
@@ -1254,6 +1309,18 @@ static int spi_nor_read(struct mtd_info
|
@@ -1260,6 +1315,18 @@ static int spi_nor_read(struct mtd_info
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
read_err:
|
read_err:
|
||||||
@ -154,7 +154,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
|
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@@ -1355,6 +1422,10 @@ static int spi_nor_write(struct mtd_info
|
@@ -1361,6 +1428,10 @@ static int spi_nor_write(struct mtd_info
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
@ -165,7 +165,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
for (i = 0; i < len; ) {
|
for (i = 0; i < len; ) {
|
||||||
ssize_t written;
|
ssize_t written;
|
||||||
loff_t addr = to + i;
|
loff_t addr = to + i;
|
||||||
@@ -1395,6 +1466,7 @@ static int spi_nor_write(struct mtd_info
|
@@ -1401,6 +1472,7 @@ static int spi_nor_write(struct mtd_info
|
||||||
}
|
}
|
||||||
|
|
||||||
write_err:
|
write_err:
|
||||||
@ -173,7 +173,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
|
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@@ -2811,8 +2883,10 @@ int spi_nor_scan(struct spi_nor *nor, co
|
@@ -2817,8 +2889,10 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||||
} else if (mtd->size > 0x1000000) {
|
} else if (mtd->size > 0x1000000) {
|
||||||
/* enable 4-byte addressing if the device exceeds 16MiB */
|
/* enable 4-byte addressing if the device exceeds 16MiB */
|
||||||
nor->addr_width = 4;
|
nor->addr_width = 4;
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
/*
|
/*
|
||||||
* Write status register 1 byte
|
* Write status register 1 byte
|
||||||
* Returns negative if error occurred.
|
* Returns negative if error occurred.
|
||||||
@@ -2883,9 +2892,16 @@ int spi_nor_scan(struct spi_nor *nor, co
|
@@ -2889,9 +2898,16 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||||
} else if (mtd->size > 0x1000000) {
|
} else if (mtd->size > 0x1000000) {
|
||||||
/* enable 4-byte addressing if the device exceeds 16MiB */
|
/* enable 4-byte addressing if the device exceeds 16MiB */
|
||||||
nor->addr_width = 4;
|
nor->addr_width = 4;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||||
@@ -1093,7 +1093,7 @@ static const struct flash_info spi_nor_i
|
@@ -1099,7 +1099,7 @@ static const struct flash_info spi_nor_i
|
||||||
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
||||||
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
|
{ "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },
|
||||||
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
|
{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
|
||||||
|
Loading…
x
Reference in New Issue
Block a user